commit cf5b77307aade1e04785922a4be0f2026cfcec48
author Junio C Hamano <junio@hera.kernel.org> Fri Sep 11 23:28:32 2009
committer Junio C Hamano <junio@hera.kernel.org> Fri Sep 11 23:28:32 2009
tree 811c90d09d6c1d013af80ebaa2a6895905eb0ec9
parent c28068f42827f92c7c73c184e4fd11ceba0c73da

Autogenerated HTML docs for v1.6.5-rc0-8-g434a 

git-am.html

diff --git a/git-am.html b/git-am.html index 001d975..1c9ef17 100644 --- a/git-am.html +++ b/git-am.html @@ -325,7 +325,7 @@  [--3way] [--interactive] [--committer-date-is-author-date]   [--ignore-date] [--ignore-space-change | --ignore-whitespace]   [--whitespace=&lt;option&gt;] [-C&lt;n&gt;] [-p&lt;n&gt;] [--directory=&lt;dir&gt;]  - [--reject] [-q | --quiet] [--scissors]  + [--reject] [-q | --quiet] [--scissors | --no-scissors]   [&lt;mbox&gt; | &lt;Maildir&gt;&#8230;]   <em>git am</em> (--skip | --resolved | --abort)</div></div>   </div>  @@ -384,6 +384,14 @@  </p>   </dd>   <dt>  +---no-scissors  +</dt>  +<dd>  +<p>  + Ignore scissors lines (see <a href="git-mailinfo.html">git-mailinfo(1)</a>).  +</p>  +</dd>  +<dt>   -q   </dt>   <dt>  @@ -628,7 +636,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2009-09-08 00:54:59 UTC  +Last updated 2009-09-11 23:28:13 UTC   </div>   </div>   </body>